cleaned up his mess a bit more