Fixed some minor things, mostly about good practice