Update for some changes + tiny cleanup