cleaned up setup file