cleaned up more stuff 2