Removed less necessary local variables