Cleanup whitespace, use forEach instead of for