FIX: Java code convention