slight changes in formating
refactored database