Ctrl cleanup and comments