Made the client cleaner.
Removed some commented-out code; minor cleanup.