Some code clean up, and styling