Code cleanup.
Added one-line layout.