Empty line cleanup
Refactoring: move instance logic to instance
version bump