A bit code refactoring is done :hammer: