Small modifications to be consistent with other Java projects.