Improved conformance with Java coding conventions.