FIX: Java code conventions