Little refactored