Refactoring. Prettification.