minor comments/fix/refactoring