chart cleanup
playing with optimiaztions