Add more test cases
Remove some comments
Indent a bit nicely
And a little more