Fixed coding standards mishaps