Deal with lint
Make the class list reuesable