some style and controller clean up