Re-factoring to use the new WithIn.withIn method to improve readability