removed class variables
Removed explicit list