Cleanups, layout formatting