[minor] Code cleanup