Cleanup, reordering, better .huge