minor tweaks, still progressing on OOP phase