Revised programming style