-- small refactor for system setup