edit styles, cleanups