Continued refactor of Chart exercise