Minor initial refactor of byte code parser