Thanks @trevnorris I have made the requested modifications