cleanup some and rename some shit