cleaning up
improved views
big clean up
improved calculations