Patch 1

Minor Housekeeping