Update: some code cleaning.