updated version and clean up
cosmetics