Removed unused Date
updated/added few comments