cleaned up formatting and warning