Cleanup, formatting