Fixed DND & tidy up formating