Clean-up
Adding comments