Added some spaces for readability.
Changed the type that gets iterated to remove warning.