removed some whitespace and old code