renaming and cleaning
refactoring the connection model