Move analytics code +indentation