refactoring to meet class stuff is complete