Cleaned up DB insert