General tidy up and sort out of the shebang method.