Refactoring: renamed classes, simplified constructor