Added Users structure; removed commented code