+ further code hygiene