Lightning Talks Day 2

Refactoring