Tidied code a little