minor cleanup on controller