Refactor - cleanup error data for better display