More formatting and organization