moved variables to make them private.