Small changes

Reduced some "uncompressable" code.