Starting to clean things up.

-- making changes and cleaning things up.