java7-code-cleaning