small optimizations
refactoring