format tuning
move google analytics code to where it belongs (previous commit got wiped, why?)