Moving detailed comments into implementation