Code cleaned-up

Moved some functionality to a new controller.