refactroed files
Merge pull request #2 from albreyb/master

refactored files