Some refactors I noticed.

Here are some refactors I noticed while reading through the code :v:.