Dev tags

This commit include some suggestions to simplify the code.

It also include some code style changes (e.g.: make it fit in 80 columns). Feel free to ignore/discard them; I understand this is a matter of taste.