Simplify further, don't use a proplist