Doing code compaction...