makes classy refactor