readability improvements
remove accidentally committed debugging code