Refactor of commenting to allow for cookie user state checking