peer review and lint fixes