Cleaned up the setup file