Changed a couple of methods so they read better.