Bit refactoring. Done 1 ticket.