Hubbified switch and code cleanup :)