Clean Up

Clean up formatting and fix some indentation errors.