reduce SLOC again