more refactoring
Merge branch 'master' of https://github.com/dkapila/aurora