Just some code cleanup

Signed-off-by: StarGate <nikola.bebic99@gmail.com>