! cleanup, non function changes