Thesis clean-up commit