Minor edits on controller