code cleanup
Merge pull request #6 from lelouch-mayher/dev

code cleanup