Changed variables to readonly