look and feel clean up.