Continue fixing and cleaning code + comments