Home Tasks 3&4 completed

Cosmetic changes. Major changes are in previous commit.
Home Tasks 3&4 completed