Move methods to main controller, add commnet header to settings.