Lil more refactoring