Fixed small issue: groupId is by default an empty String.
Some cleaning up.