Tidied various elements