Small issues fixed
Added maven plugin goals description and light refactoring