fix nits, clean up workspace