Slight clean up.