Code style fixes

Please try and keep all code syntax/style the same. Really helps
readability if everything looks the same.