modify views and clean up code