Removed some useless var creations before returns