cleaning up the commit to fit style, deal with #2449