compression updates, cleaner code