Some more code cleanup

Signed-off-by: Swizzy <swizzy@hotmail.co.uk>