Cleaned up the structure to match a proper .el file, added comments to
make it look nice.