look and feel cleanup