Several code style fixes, thanks Subv