consistent use of the ':' (switched to dnj's style)
no more tabs
no more trailing whitespace
consistent naming