Cleanup and justify