Code cleanup

Remove some of my bad code
Follow defaults conventions w/ options used in most other grunt libs