Cleaned/commented some stuffs