cleaned up code in all java files