Tidy some formatting and redundant comments