For #44 converted all return nothings to return voids