add chart fill and code cleanup