Cleaned up code, added comments for clarity. Added entries to dictionary