General tidy up and slight change of push code