Some refactoring. Timepass