Clean up and alpha sort