Removed useless TODO and minor cleanups. Related to issue #62.