Fixes Proposed for Issue under "Common 7 and 8"

This is what I have done to address the issues assigned. Please let me know if there is any way in which I can improve it or if I should be approaching this with a different reasoning.