Aesthetic changes

Reorganized code; simplified console display functions