Clean up so easier for people to inspect