Refine code a little bit.