Perhaps more readable? Will create a new PR anyway