Major improvement in coding style.