made some edits, tried to clean up the views