More idiomatic
delete commnented out code