clean names a bit better