Better file organization, remove superfluous lines, add awesome new modes.
Improve file structure