Fixed accidental paste from another yet-released project.
Code clean up. Should close #2.