refactoring
Merge pull request #1 from liquidautumn/master

refactoring