fixes applied to formatting