cleanup, formatting fixes.