Minor cleanup

Minor changes to cleanup the code