Clean-up and added pyramid