small readability refactoring
unused code removed