Coding style fixes
Makes some things in database.c look prettier