refactoring to make use of those defined constants
There is some inconsistency in the Database.cpp about how constants are placed there (sometimes by defines, sometimes just in plain text). I really don't want to mess up anything, just want to make it one way or another.