- Some code cleaning and fixes.