- refactored DB data insertion