Reformat, debug code removed