bit more cleanuo