Minor updates with middleware to correct formating.