Some code and comments cleaning.