Fixed CodingStandards