minor maven cleanup and formatting work