Improve Maven style
Remove white-space from Maven cut and past sample
Update documentation
Update documentation