Small improvemens