Some Code cleanup

Signed-off-by: Swizzy <swizzy@xeupd.com>