refactoring to be the way i like it