Refactoring to java convention.