Cleaning, re-indentation prior to the addition of controller register method