solely formatting and quick cleanup