Clan up code style