Made few simplifications in OTPHomework