changed: stupid things into less stupid things