Added changes to formatting package in some classes.