One level of braces from major function is gone. Now it's ought to be more readable and whatever