final changes, formatting