Refactored code and updates to ARTT front-end.