style: Cleanup