changes as per hound-suggested best-practices