Rearranged solution to making building samples easier
Tidying samples
Rearranged solution