More formatting and organizing