Some code cleaning (arranging and deletion of unnecessary code).