Code refactor.  Cleaning up ~ usage.