Small fixes to adhere to standards better