Issue #0 mostly just coding style clean up