Make eclipse happy with maven
Make some methods static
Remove duplicate string