Refactoring and tidying up
Eliminating void pointer usage