cleanup for better layout