made minor changes to clean up views