Getting rid of more code