review and lint fixes