Clean up and organize all in one