Cleaned up views
PEP8