Just some clean-up of the code