moving methods around really screws up git diff