Made the coding standard consistent