Tidy up

Fixed incomplete and incorrect comments.
Removed unreachable code.