refactoring
fixes
minor fix