Code reformat, removed unnecessary checks, tiny fixes
Merge pull request #29 from anzarafaq/master

Code reformat, removed unnecessary checks, tiny fixes