refactoring: move methods, better organization