Formatting + fixes