Refactor to be more compressor friendly.