cleaning up look and removing redundancies