Formatting and removed fromJust calls