minor refactoring
minor updates