fix spacing, remove irrelevant comments