Cleaning header
Cleaning up Controller.cpp