Clean-up, a few more additions