Clean up code
Clean up code

Just making it a little clearer what's going on by changing the variable names and removing some redundant code.
silverstripe/silverstripe-cms,jonom/silverstripe-cms,jonom/silverstripe-cms,silverstripe/silverstripe-cms