clean up
clean up, and magic with java templates
some clean up for skeleton