More code cleaning, and minification