Fix formatting

+ remove some redundant comments