Refactoring assembler class