Clean up of wb.h codebase

Hey @ashwin,

Receiving @nfarhat's issue reminded me that I hadn't sent through a pull request of the clean-up I performed on the code base at the conclusion of the course last year.

Regards,

André