Refactored "database.h"

Removed stray comment at end of file and made some minor formatting
fixes.