More formatting and cleanup