Code cleanup surrounding new controller