Start cleanup of macro usage.
Removed usage of macros where not needed.
Update version number to v1.1.0.