Clean up

I supposed that is the final version for Q1 a and b