cleaned up a ton