Could be more more clean