Cleanups for style conformity