better col names, kill old arguments, indentation