Small improvements to originally submitted code