Cleanup, fix lint errors
Merge conflicts