Refactor L1