refactor code
Merge pull request #1 from gtimmy/dev

refactor code