Timer

more or less rather cosmetic changes, just an exercise to collaborate over github