renamed Mixin class
added bolding in headers