Lil Refactoring