More tweaks
Removed TODO item