Updated comments, removed array declarations.