Fix the boiler plate codes