WIP cut down long lines, remove redundant comments