Minor changes / Cleanup