code cleanup, added more wordage