runastyle amd minor cleanups