Tidied up stuff, further. Now uses proper writing