Some refactors I noticed
Merge pull request #5 from chicisimo/refactor

Some refactors I noticed