- Cleanup and lint fixes