Clean up and some implementation of views