Changed uid back to user_id, and removed the end-of-line comment parsing.