cleanup, formatting