Tidied up some stuffs