Cleanup + adding comments