Clean up and improve number of layers