some refactoring :)
fix merge
refactoring
refactoring connection/resource