Refactor, refactor, refactor...
More refactoring. Added styles.