updated and tidied everything