Add another line shortening strategy

If other strategies fail, try putting newlines after each comma token.
Remove unused variables