clean up code
Merge branch 'topic-raintime-refactoring' of github.com:rainjs/rainjs into topic-raintime-refactoring