Cleanup and regularize; account for remoting into a Mac