Make some of the things private-ish