fix master

minor refactoring