somehow i missed this file while i was committing last time.
Even more refactoring