Formatting/comment updates to htc.c. Also removed commented code that is no longer in use.