whitespace and old code removed