Eliminated BardVariant class.
Cleaned up code.