MAJOR code clean-up and updated compression file