bit of renaming.
remvoe leftover commented code.