Analytics changes, formatting