Code cleanup

Bit of a code cleanup
Minor changes

Minor changes