Code cleanup
Make sure custom helpers and chaining works