Bit more refactored