Refactored - cleaned up naming a bit