Fixed coding standards issues?