Remove extra trailing whitespace

This is good to merge, I rebased both commits and did a force push in my branch