Some changes collected over time
Cleanup a bit