Start cleaning up markup and styles