some code cleanup in preparation for a cleaner client/server split