FIX: improved code quality by sticking to Java conventions