fixed typo in comment; misc. code clean-up