Applied more-correct styles from style guide