Some code cleaning && comments