Improve Camera Controller