cleanup
simplified source access