Formatting + minor fixes