Revert "Cleanup"

This reverts commit 4448a821fa9dae27f8caf51d137430fa9d3721e3.
Revert "Revert "style fixes""

This reverts commit 106172c96294c4c7a09a3865e3503e13598a42f4.