A few changes I've made in the past months, mainly code clean-ups

I am so glad to see that you pushed to UnderC again *\\(^o^)/*