Tidied up some code in Section