cleanup and refactorings in L5