Remove debugging statements; style fixes