Slight refactoring and adding (wrong) figures to chart