Assigned1: Minor improvements