Replaced old license information.
Straightened up defines.