--- "classcharts-api": patch --- Tidy up code