Minor refactor of classes