Clean-up

Some clean-up modification to have a better starting kit.