A bit more code cleanuo