Simplification of Controller