Name algorithm made neater

Also removed some testing functions and names from master branch