Line break cleanup, analytics code added