Minor cleaning. now warning-free.