Cosmetics, renamed some db-related variables properly.