Style cleanup
Style and test cleanup
Merge pull request #116 from rackerlabs/cleanup

Test and Style Cleanup