minor refactoring / comment updating