finish up settings and and remove unnecessary boilerplate code