updated
continued, clean-up