Fixed CS and improved code readability
Merge pull request #12 from tristanbes/master

Fixed CS and improved code readability