Refactor bit more