Clean up to make it easier to understand

Also removed empty spaces
Remove spaces
Merge pull request #4 from ericwongcm/2.1

This modified config will be easier for others to use