syntax enhancements
reorg