Some clean-up
Some clean-up