Clean, refactor and update to lollipop
Materializing