Tidy Up + adding comments