futher cleanups and stylings