Small cource code clean ups