Re-ordered definitions in file to follow eager -> lazy. Removed #defines and replaced with scoped consts
Merge pull request #10 from HennyH/reorder-file-content-defines-to-consts

Re-ordered definitions in file to follow eager -> lazy. Removed #defines...