WIP fixed some style issues per stvstnfrd's PR comments