Cleaned up macro and var names