Code cleanup

Did a lot of stuff and things. It’s best to just check the History