Cleaning up; small changes