Refactored and a little bit of drying up