You should split things like this out into separate commits (if not separate pull requests).