Various minor stuffs on code