Tidied up and cleaned up some stuffs