Cleaned View and Controller classes.