got rid of all the warnings - cosmetics