lil refactoring