added database path, improved formatting