Code cleaning 2

Mattias commits because André made harakiri commit last time.