Debug variables removed and reformat