clean-up, improvements in presentation