Coding cleanup

Add comments for move types.
combine some cases.