tidied code and files