Do some repositioning of code