For #118: reduce uses of package name, remove static imports