Restructure - less creation/destruction and more portability