Some miscellanous code cleaning.