Tidied up the code - removed a function
Merge pull request #5 from tagawa/optimisation

Tidied up the code - removed a function