style cleanup and pic