Refactored to a better package name, hid unused variable until future
use