Refactoring and adding spacing.