cleaning, refactoring, adding missing classes, attr, ..

I don't mind it for specific cases but I would rather have the consumer handle null cases because in certain cases they could mean different things.