Little refactoring. Little coding...