Fixed Class Names
Cleaned up list of dictionaries
updated spacing
removed extra lines of code