remove comments, cleanup, fix figure styles