Refactoring...

ohgodiamhavingflashbacks