Formatting clean up and styles.