Controller cleanup and commenting