Getting rid of explicit namings

good point