Cleanup, fix formatting.