Very minor changes (comments, cleaning)