CreateContext refactoring
EditContext refactoring
Refactoring
Merge pull request #87 from norzechowicz/refactoring

Refactoring