5/6 - Clara modifications: remove php shorthand, error fixes