Minor cleanup..