Cleanup comments, remove redundant instanceof check