Removed lots of var-statements.