Clean codes and update models

Clean codes according to PEP8.
Update models attrs.
Merge pull request #2 from wdholmes/develop

Clean codes and update models