Remodeled a few things

I made these changes to get it to work better for me