refactored to more appropriate class name