code cleanup, added styling