More idiomatic requirement of libraries and warning fixed