refactors and notes
Merge pull request #5 from pelick/develop

[REFACTOR] refactors and notes