Streamlining the code
Merge https://github.com/tkloong/TOC_HW3