Chores: Reduce Code Duplication

[Pdzly]

There are some cases of unnecessary Code Duplication, i marked few that i made with @code-duplication in a comment.

[Pdzly]

Note many of them are in the branch #359