refactor class cluster pattern based on increased understanding