More cleanup and refactoring this time its wii