Made some code improvements
Merge pull request #4 from rcaracaus/code-improvements

Made some code improvements