Quick clean up of some of the code

No canges to functionality