Tinkering, remove intermediate variables