Code Cleanup

Hi David, made some small changes.