[PATCH 16/18] Refactor by breaking long expression into two