Added table style and code cleanup