Cleaned up source and dest references