More groovy/java style fixes