Only use nicknames instead of full addresses in logging messages; Minor cleanup