refactor install, style fixes