Some basic refactoring
Merge branch 'master' of ssh://github.com/shumash/db_project