Fix for Maven 3.1+
Add comments
Add comments
cosmetic changes