VE-1460: Cleanup and some sweet comments