Tidied as requested by Arian Stolwijk today