[openFATE 306647] Make openFATE More Readable