cleanup + more code refactoring