Fixes #4
Using the string apply method provides better accuracy. Also got
rid of some unused files