Whitespace & documentation all over the place
Less hardcoding in es-plugin.properties