Syntax cleanup according to Java standards