Cleaned up use of var