Tidied up function rows creation