clean up comments, add TODO comment for users table