remove debug log and minor formatting