Changed output for the EPFD and SFD to be more consistent and concise