clean up linter errors
convert to class based controllers
merge issue