Small changes related to formatting