more refactoring, more comments