minor changes(clean-up)