TASK 2: Several small fixes

Fixed comments, removed unneeded code.