Tidied code