controller commenting/code cleanup