Misc fixes for uniformity
Merge pull request #14 from Nurhashimah/master

Misc fixes for uniformity