Tidy and add comments

It is a good idea to comment in the file itself
so that actions do not get lost within a mess
that is git blame maps!