adjusted data source methods, general cleanup