Comments, code cleaning, etc