Simplified code

ditto