CrazyOnline: some code cleanup