more code compaction