tidying, eradicate warnings