Code convention and minor fixed