Made things tidier. Also, only admin can re-fill database.