General Tidy up

Rename some properties and variables and main method of algorithm