Removing unnecessary var declarations