More optimizations

Continuing effort to take advantage of object methods and optimizing
classes with properties and more efficient operations.