Fixed code standards issues