optimizing some easy wins