Tidied function calls. Functionally unchanged