refactored code, what the heck was i thinking?