Revert "Complted Challenge #3"

This reverts commit a7bac7501ddadf61afbe9ac25f143892ed894133.
Completed Challenge 4 + other code improvements & enhancements