Comments and code cleaning.