Lots of bugfixes, typos and cleanup

case doesn't matter but I'm probably like you and like things to be neat :package: 
I tend to use the forEach type casing anyway