clean up formatting
adding analytics