remove some more unnecessary code for readability