Condensed code and made it neater
Merge pull request #99 from anthonyhlcheng/master

Condensed code and made it neater