Some more cleanup and new Database View