a bit more cleaning to make things clearer