refactor: general cleaning up

[SamiSuleiman]

• removed redundant code
• used file-scoped namespaces
• used var when possible instead of the type
• inverted if statement for less indentation

[SamiSuleiman]

@emrekizildas Hope this isn't too much or just useless. Much love.