improve theme functions comments/formatting
remove analytics