little big refactoring