thesis work, code style upates