small semantic changes, cleaned up what we dont use