Update setup file

Re-code setup file to be pragmatically correct.