Refactor methods for better readability
Merge pull request #32 from henriquelemos0/better-readability

Refactor methods for better readability