Refactoring
refactoring helper classes
Plane is landing, committing a partial refactor
More refactoring (Plane still landing)
Refactoring, using builder to minify