cleaned up all the warnings