some minor changes
before hard refactoring