+ cleaned up some shit