Refactor: renamed function
Refactor: renamed function
Reformatted code
Deleted obsolete tests (midje :autotest was not working properly...)