cleaned up variable definitions
made more idiomatic
almost turned wikipedia data into a nice data structure