cleanup layout + helpers