woot, cleaned up a bit