Do the basics right

Date: 16 Sep 2019