Adopt object-oriented approach. Remove blanket import.