Removed extra classes and more meaningful variable names.