refs #8: removed some dead code
refs #8: comments and a small refactor