Clean up code, no implementation changes
60 files changed