Cleanup some unnecessary things & small improvements