Removed some old code, compressed people result code a little