cleaned up and added to Maven configuration