remove comments, fix formatting