Remove hardcoded database info, use properties