style/markup cleanups + changes