Refactor Assembly to class