minor formatting/type fixes