Manual style fixes, logic was not affected