Style changes, cleanup
Merge branch 'master' of https://github.com/gunzm1/ElephantSearch