slight code cleanup, visual design