Re-factoring code with Eclipse's automatic tools for better readability