refactor courseware
fix extra jumps, remove extra lines