formatting fixes - please use alt-shift-F next time!