Code cleanup and start of CSS update.