"fixed" java-style code