Code beautify.

Temporary commit need testing.