refactoring, #24, #25, performance, etc.