refactoring: got rid of duplicate classes