Tidied with JS lint