Refactored byte codes