silently fail on invalid controllers
minor cleanup on controller