lots and lots of changes
totally more readable
and a comma