minor refactoring and updated author