made final cleanup to controller and html file