changed setup file format, simplified