cleaned up some crap