Cleanup of lay outing code