lil refactoring
lil refactoring