simplified more references with a method that wasn't being used