Simplify | organize | beautify

Simplify | organize | beautify