cleanup, formatting, etc