improved formatting?