Clean-up, adding comments