Improve Code structure

[Nighmared]

this code was written a long time ago, in today's world modern tooling throws a ton of warnings and errors, fix these :)