minor organization / code styling tweaks