Controllers code reformat