removed old code
small adjustments