Liten refactoring